Waf update #421

ederag · 2019-07-11T22:13:50Z

This is a PR for the waf update (issue #399).

Need to (at least):

curl -o waf https://waf.io/waf-2.0.17 waflib from waf commit 190555a8d631b387323e7d7d3771c56fa1884743

some dependencies (e.g. intltool) might be installed only for python3

data/wscript_build: - removed misleading #!/usr/bin/env python2 - wildcards need ant_glob now wscript: - help is excluded for now. - gnome feature is no longer available in waf. => postinstall_icons and postinstall_scrollkeeper commented out for now. - hamster-time-tracker.schemas is first generated in the build root, and subsequently installed to /etc/gconf/schemas/. The destination can be changed with the new --gconf-dir option. So packagers would use something like ./waf configure build --gconf-dir=%{_sysconfdir}/gconf <...> - gconf schemas are now correctly registered globally with --makefile-install-rule this should reduce the risk of facing issue 265 again ("Tracking settings don't save") - bld.new_task_gen(...) is not available any longer, replaced with bld(...)

License copied on 2019-07-13 from https://waf.io/apidocs/copyright.html Same as the main waf script license header. Checked that this is the New BSD License (3-clause) https://en.wikipedia.org/wiki/BSD_licenses#3-clause as also stated in https://en.wikipedia.org/wiki/Waf#License

manage_gconf_schemas and update_icon_cache otherwise appeared as valid commands in ./waf --help.

Building and installing help pages now work with the new waf version. WIP: doc_commands is not fully exploited yet

ederag · 2019-07-27T16:11:07Z

Docs and main app have been separated.
hamster works fine on ubuntu-19.04. The help should be available.
Please note that installation instructions changed.

I'm giving up "allow to build documentation as static html files",
not obvious, and not worth the trouble for now.

scrollkeeper is no longer used.

Otherwise a spurious /usr/hamster-time-tracker.schemas/hamster-time-tracker.schemas was installed.

Allowed to remove compat15

PYEXECDIR is intended for binary python extensions. PYTHONDIR is guessed by conf.load('python'), if not given

ederag · 2019-08-05T20:56:16Z

Installation worked on clean openSUSE Leap 15.1, ubuntu 18.04 and 19.04 virtualboxes, but
66baf83 looks like a hack.
Moreover splitting the documentation and main app builds brings trouble for the uninstall process.
Let us just skip the documentation build if xml2po is not found, to reduce dependencies.

Just skip documentation if xml2po is not found.

ederag · 2019-08-06T09:57:35Z

Done.
Tested on clean openSUSE Leap 15.1, ubuntu 18.04 and 19.04 virtualboxes.

Feedback would be welcome !

For review, here are the changes except the waf update itself.

GeraldJansen · 2019-08-10T09:58:44Z

Feedback would be welcome !

Works for me on Xubuntu 19.04! Including the help pages. Many thanks for all that work!

The only glitch I ran into is that I normally use umask 0007 and that caused the files installed in /usr to be not readable by regular users. After uninstalling, and starting over with umask 0002 all went smoothly. (Maybe waf could set the umask to avoid this issue.)

Maybe there is not much feedback because some people (like me) don't know how to go about testing a pull request. This is the way I did it:
git clone --branch=waf-update [email protected]:ederag/hamster.git hamster-waf-update
but there are probably better ways (git add remote?).

Before installing I did a sudo ./waf uninstall from my previous version and sudo rm -rf /usr/lib/python3/dist-packages/hamster. I also found a few other leftover files with find /usr -name "hamster*" and removed those too.

ederag · 2019-08-10T16:52:07Z

Thanks for the feedback !

Maybe waf could set the umask to avoid this issue.

Forcing umask might be disturbing.
pip use standard umask, and so does waf.
A warning would be nice, but how to get the default umask ?

[...] there are probably better ways (git add remote?).

Thanks for the "one-shot" command !
Wiki updated with more complete instructions.

I also found a few other leftover files with find /usr -name "hamster*"

That should not happen in principle. Here is a guess.
To correctly remove a version earlier than this PR (e.g. v2.2.2),
the --prefix=/usr is required for the configure step:

git checkout v2.2.2
./waf configure --prefix=/usr
sudo ./waf uninstall

GeraldJansen · 2019-08-10T17:39:20Z

Thanks for the tip about umask and sudo pip install: finally I know why I've always had those permission problems installing with pip! For hamster, maybe just change the docs to ( umask 0022 && sudo ./waf install; ). Works for me and leaves my usual umask unaltered.

My "hamster*" left-overs in /usr may have come from some manual interventions trying to get the docs/yelp working with xfce in various past versions. Uninstall works cleanly now.

Thanks also for the improvements in the documentation about Contributing. Super.

ederag · 2019-08-10T19:41:15Z

( umask 0022 && sudo ./waf install; ). Works for me and leaves my usual umask unaltered.

That is quite surprising, as sudo is designed to be insensitive to the calling environment.
Indeed here,

> ( umask 0002 && sudo bash -c umask; )
0022

Trying to understand, I found this very interesting answer about default umask in ubuntu.

GeraldJansen · 2019-08-10T22:45:29Z

Based on this, sudo usually is sensitive to the user's umask. My solution is not very elegant but it protects against an overly restrictive umask. Now I've added these lines to /etc/sudoers so I personally won't have the problem anymore:
Defaults umask=0022
Defaults umask_override

ederag · 2019-08-11T12:41:16Z

Thanks for the link, this makes sense now.
Something has to be done. I would add some explanations,
otherwise that might look suspicious to people who never faced the issue.
For instance:
"""

# thanks to the parentheses the umask of your shell will not be changed
( umask 0022 && sudo ./waf install; )

The umask 0022 is safe for all, but important for users with more restrictive umask,
as discussed here.
"""

Finally, it happens that the instructions are not exactly copy/pasted anyway.
So to help finding this discussion, in case of a too restrictive umask, launching hamster yields

Traceback (most recent call last):
  File "/usr/bin/hamster", line 30, in <module>
    from hamster import client, reports
ImportError: cannot import name 'client' from 'hamster' (unknown location)

ederag · 2019-08-25T07:20:29Z

Thanks again for the feedback Gerald !

GeraldJansen · 2019-08-25T07:29:11Z

A big step. Yahoo!

ederag added 8 commits June 29, 2019 20:55

upgrade waf

e265292

curl -o waf https://waf.io/waf-2.0.17 waflib from waf commit 190555a8d631b387323e7d7d3771c56fa1884743

impose python3

cac48db

some dependencies (e.g. intltool) might be installed only for python3

use Utils.O755

e6d0d5b

update GTK icon cache on install

7e3831c

move helper functions inside build

6915088

manage_gconf_schemas and update_icon_cache otherwise appeared as valid commands in ./waf --help.

update help/wscript

7a7797b

Building and installing help pages now work with the new waf version. WIP: doc_commands is not fully exploited yet

ederag mentioned this pull request Jul 22, 2019

location error in waf (/us/ -> /usr/) #425

Closed

ederag added 3 commits July 27, 2019 13:42

waf: separate documentation from main application

3deeb0e

doc: update dependencies

ea522c5

Merge branch 'master' into waf-update

1ab112d

ederag added 2 commits July 30, 2019 20:40

waf: remove unnecessary dbus tool loading

2ad4c5e

doc: installation works in 18.04 as well

3dcb982

This was referenced Jul 30, 2019

No longer in Ubuntu 18.04 #356

Closed

default hamster build to /usr/local results in broken setup #309

Closed

ederag added 10 commits August 3, 2019 10:27

change default prefix to /usr

ed54143

cleanup: split long lines

f9f3a99

use install_path+target instead of install_path+install_files

f98cf36

Otherwise a spurious /usr/hamster-time-tracker.schemas/hamster-time-tracker.schemas was installed.

doc: confirm openSUSE Leap-15.1

496e144

remove unused prefix compatibilty line

44d0197

remove the /usr/etc => /etc hack

f3ed086

bypass schemas management for --docs

66baf83

use env. instead of .define

3e863ba

Allowed to remove compat15

remove PYEXECDIR

45dfe88

PYEXECDIR is intended for binary python extensions. PYTHONDIR is guessed by conf.load('python'), if not given

cleanup: remove redundant import

31321d2

ederag added 2 commits August 5, 2019 23:04

remove --docs option

2c30b22

Just skip documentation if xml2po is not found.

add uninstall instructions

82ea607

update NEWS

0a23d68

ederag changed the title ~~[WIP] Waf update~~ Waf update Aug 6, 2019

ederag added this to the v2.3 milestone Aug 6, 2019

add umask 0022 to installation instructions

f9187a2

ederag mentioned this pull request Aug 14, 2019

Week view is set for next week #392

Closed

Merge remote-tracking branch 'upstream/master' into waf-update

2649989

GeraldJansen mentioned this pull request Aug 24, 2019

Future of hamster v3.x? #433

Closed

ederag merged commit d15555e into projecthamster:master Aug 25, 2019

ederag deleted the waf-update branch August 25, 2019 07:19

This was referenced Aug 25, 2019

After waf ? #399

Closed

debian/RPM dependencies still for python2 #369

Closed

WBTMagnum mentioned this pull request Aug 27, 2019

Unable to build #402

Closed

GeraldJansen mentioned this pull request Sep 4, 2019

Install permissions on Xubuntu 19.04 projecthamster/xfce4-hamster-plugin#34

Closed

ederag mentioned this pull request Oct 15, 2019

Settings window won't open #464

Closed

extraymond mentioned this pull request Dec 20, 2019

Snap package for hamster #418

Closed

ederag mentioned this pull request Feb 19, 2020

remove binary waf footer #569

Merged

matthijskooijman mentioned this pull request Nov 18, 2023

release 3.0.3 #686

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Waf update #421

Waf update #421

ederag commented Jul 11, 2019 •

edited

Loading

ederag commented Jul 27, 2019 •

edited

Loading

ederag commented Aug 5, 2019 •

edited

Loading

ederag commented Aug 6, 2019

GeraldJansen commented Aug 10, 2019 •

edited

Loading

ederag commented Aug 10, 2019

GeraldJansen commented Aug 10, 2019

ederag commented Aug 10, 2019

GeraldJansen commented Aug 10, 2019 •

edited

Loading

ederag commented Aug 11, 2019

ederag commented Aug 25, 2019

GeraldJansen commented Aug 25, 2019

Waf update #421

Waf update #421

Conversation

ederag commented Jul 11, 2019 • edited Loading

ederag commented Jul 27, 2019 • edited Loading

ederag commented Aug 5, 2019 • edited Loading

ederag commented Aug 6, 2019

GeraldJansen commented Aug 10, 2019 • edited Loading

ederag commented Aug 10, 2019

GeraldJansen commented Aug 10, 2019

ederag commented Aug 10, 2019

GeraldJansen commented Aug 10, 2019 • edited Loading

ederag commented Aug 11, 2019

ederag commented Aug 25, 2019

GeraldJansen commented Aug 25, 2019

ederag commented Jul 11, 2019 •

edited

Loading

ederag commented Jul 27, 2019 •

edited

Loading

ederag commented Aug 5, 2019 •

edited

Loading

GeraldJansen commented Aug 10, 2019 •

edited

Loading

GeraldJansen commented Aug 10, 2019 •

edited

Loading